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

Change-Id: If60714a84f9c174757c8e274dd663210abe2a072