Merge remote-tracking branch 'origin/upstream' am: a57395f74a am: 32a5033b59

Original change: undetermined

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