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

Change-Id: Idefcd82208d7d86ff6353a3b220856131ad56773