Merge remote-tracking branch 'origin/upstream' am: 6eee6a40b4

Original change: undetermined

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