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

Original change: undetermined

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