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

Original change: undetermined

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