Merge remote-tracking branch 'origin/upstream' am: 58a88e2d83 am: 86059ff507

Original change: undetermined

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