Merge remote-tracking branch 'origin/upstream' am: 17f307710a

Original change: undetermined

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