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

Original change: undetermined

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