Merge remote-tracking branch 'origin/upstream' am: 672b2e9435 am: ec2d738aa5

Original change: undetermined

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