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

Change-Id: Ic62f0e5d7af78d590236b653b55d0353e6bae353