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

Original change: undetermined

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