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

Change-Id: Ibdb8248df171bf94d866343e35dad63d0c461811