Merge remote-tracking branch 'upstream/chromeos-3.14' into chromeos-3.14__release/core40-12-12

Change-Id: I3bf29a88d37464838773df4e6839c8e043e5d4a3