Merge remote-tracking branch 'origin/upstream' am: 00cdcfa5e1

Original change: undetermined

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