Merge remote-tracking branch 'origin/upstream' am: 01030d454c

Original change: undetermined

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