Merge remote-tracking branch 'origin/upstream' am: 0fe0ed3fe4

Original change: undetermined

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