Merge remote-tracking branch 'origin/upstream' am: 68bc564c6f

Original change: undetermined

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