Merge remote-tracking branch 'origin/upstream' am: 74f70830fe

Original change: undetermined

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