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

Change-Id: I70d42d929b629ef2018d15aeb25328894a37d0d4