Merge remote-tracking branch 'origin/upstream' am: f0eba62f7c

Original change: undetermined

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