Merge remote-tracking branch 'origin/upstream' am: aaaa743877

Original change: undetermined

Change-Id: I2de03a5f10041c1b38b9b8a861dd59b4bfca1d10
Signed-off-by: Automerger Merge Worker <[email protected]>