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

Original change: undetermined

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