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

Original change: undetermined

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