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

Change-Id: Id4a940160443ec74211682facd5c32ab83c200d8