Merge remote-tracking branch 'chrome-platform/for-next'