Merge remote-tracking branch 'origin/upstream' am: ddbb570ddc am: edaad73d60 am: f6c12be8c4

Original change: undetermined

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