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

Original change: undetermined

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