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

Original change: undetermined

Change-Id: I9705e1e0c5112c016d136f5d645391fee178cc21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>