Merge remote-tracking branch 'origin/upstream' am: 2387af2c6c am: 17638d59c8

Original change: undetermined

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