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

Change-Id: I3b87fb0a7e378237773321bb7f0385c4aeaf57c9