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

Original change: undetermined

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