Merge remote-tracking branch 'origin/upstream' am: 2b01862e43 am: bddc41dc85 am: 431012b6b9

Original change: undetermined

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