Merge remote-tracking branch 'origin/upstream' am: 3fba44c118

Original change: undetermined

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