Merge remote-tracking branch 'upstream/chromeos-4.14' into core35-for-chromeos-4.14

Change-Id: Ib36da2b41bf0acef982f8d888835dfb6d9df73b9