Merge remote-tracking branch 'origin/upstream' am: 85f60adb4d

Original change: undetermined

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