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

Change-Id: Ic23b12bf9950a6937439d9943df48a17046fb3e2