Merge remote-tracking branch 'origin/upstream' am: a2909347ec am: 5fe8da383f am: c4b16643db

Original change: undetermined

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