Merge remote-tracking branch 'upstream/chromeos-3.18' into chromeos-3.18__release/core52-142

Change-Id: Id64c95e0666f877968082243091cf6180e4cd13e