Merge remote-tracking branch 'origin/upstream' am: 3a6ef82f9a

Original change: undetermined

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