Merge remote-tracking branch 'origin/upstream' am: b96d052978

Original change: undetermined

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