Merge remote-tracking branch 'upstream/chromeos-3.18' into core35-for-chromeos-3.18

Change-Id: I6d708b5251356a4f98e5aa49db839b577d8a65b7