Merge remote-tracking branch 'origin/upstream' am: 6cfdc15d2d

Original change: undetermined

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