Merge remote-tracking branch 'origin/upstream' am: a81a9f4598 am: 6ee9851196 am: 924274b74d

Original change: undetermined

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