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

Change-Id: I3a95076714100bf994820f28a2fcfb9157be3827