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

Original change: undetermined

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