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

Change-Id: I3aa5f9ac6325e7d36f656e45cb82f514c16acb76