Merge remote-tracking branch 'origin/upstream' am: 672b2e9435

Original change: undetermined

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