Merge remote-tracking branch 'origin/upstream' am: dfc27b470e

Original change: undetermined

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