Merge remote-tracking branch 'origin/upstream' am: 61a465c333

Original change: undetermined

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