Merge remote-tracking branch 'upstream/chromeos-3.8' into chromeos-3.8__release/core40-12-12 Change-Id: If522e20363a33bb184fc4eb774a2e62103ae7c82