Merge remote-tracking branch 'origin/upstream' am: 7556e10f7f

Original change: undetermined

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