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

Change-Id: Iafe8a576dfcdf6f70c6f2d0c0905504c0b076283