Merge remote-tracking branch 'upstream/chromeos-3.14' into chromeos-3.14__release/core38-78

Change-Id: I71631d722912b5a18199e2118f23e53b89ad4e3b