Merge remote-tracking branch 'origin/upstream' am: fc3cbf2928 am: ae8ad4ad09

Original change: undetermined

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