Merge remote-tracking branch 'origin/upstream' am: 10918a5615

Original change: undetermined

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