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

Change-Id: Iad594b5ba52986dc85124de30a6220050790aa19