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

Change-Id: I609cfcae673170270ba0aec6451bf2836896665c