Merge remote-tracking branch 'origin/upstream' am: 687bf36694

Original change: undetermined

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