Merge branch 'typec' into 4.14.98