Merge remote-tracking branch 'origin/upstream' am: 687bf36694 am: ba564ff067

Original change: undetermined

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