Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Change-Id: I25cfc2099713bda5a09eaf4b99527926ebebbe29