Merge remote-tracking branch 'origin/upstream' am: 4e0e24be43

Original change: undetermined

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