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

Change-Id: Iadd1c0a05d82913342e4ce27515e01f2a60363d5