Merge remote-tracking branch 'origin/upstream' am: 93224a77fa am: d87743295d

Original change: undetermined

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