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

Change-Id: I4db7d1b0a979d4c09c2797d803878b01da9a2447