Merge remote-tracking branch 'origin/upstream' am: 0ccd6fc43d am: d6773fefc0 am: a108558182

Original change: undetermined

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