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

Change-Id: Ic29917909aa07c640f39a61015361fafdd0751b2