Merge remote-tracking branch 'origin/upstream' am: 7ae6c851c8

Original change: undetermined

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