Merge remote-tracking branch 'origin/upstream' am: 2387af2c6c

Original change: undetermined

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