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

Change-Id: I753a8aaa7c1fb054ac6f249c86b5476f65e98914