Merge remote-tracking branch 'origin/upstream' am: 6cfdc15d2d am: 7668de6156

Original change: undetermined

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