Merge remote-tracking branch 'origin/upstream' am: 7b05fe7bc2

Original change: undetermined

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