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

Original change: undetermined

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