Emergency workaround to patch over ID shuffling.

Bug: 188050150, 188011554
Test: manual
Change-Id: If865def2961b28d45b50a055272d8b24af7bbd32
(cherry picked from commit 62c5678f62ad1f11e5c90c3c927974fa1cdaa219)
2 files changed