Merge remote-tracking branch 'origin/upstream' am: f2ea7c09d1 am: 5099e4914c

Original change: undetermined

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