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

Change-Id: I6e7a44dea2f890b1617ff937a41556c460e619d3