Merge remote-tracking branch 'origin/upstream' am: 800ce13e81

Original change: undetermined

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