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

Original change: undetermined

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