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

Change-Id: I10d16abe5db92522064051edde85dbc2ede0e300