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

Original change: undetermined

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