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

Change-Id: I38990528007333e2c19d223ac4d01c615a146468