Merge remote-tracking branch 'origin/upstream' am: 691813a94e am: 35933ac783 am: 0a4aa7892e

Original change: undetermined

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