Merge remote-tracking branch 'upstream/chromeos-4.14' into chromeos-4.14__release/core47-82-2

Change-Id: I8b272a18cecb8b703f77fc9e73c3b80a5cd66d97