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

Change-Id: I02f523a00b3609c09fdd589031414d5e7c9a410c