Merge remote-tracking branch 'origin/upstream' am: 65408a8cd5 am: b32946e303

Original change: undetermined

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