Merge remote-tracking branch 'origin/upstream' am: da962d0686 am: 41b390c0c7

Original change: undetermined

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