Merge remote-tracking branch 'upstream/chromeos-3.14' into chromeos-3.14__release/core43-116-2

Change-Id: Id12cf1555179b41f1555b0ded8b96b0ec0143a46