Merge remote-tracking branch 'origin/upstream' am: 15514ac8a6

Original change: undetermined

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