Merge remote-tracking branch 'origin/upstream' am: be49714f29

Original change: undetermined

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