Merge remote-tracking branch 'origin/upstream' am: 5e69a0da6c am: 9c905b9115

Original change: undetermined

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