Merge remote-tracking branch 'origin/upstream' am: 4d2bf6d693

Original change: undetermined

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