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

Original change: undetermined

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