Merge remote-tracking branch 'origin/upstream' am: aedd517eda am: 33b5122b50

Original change: undetermined

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