bug: 73143991 Test: 616-cha-unloading (cherry picked from commit a7343b20) Change-Id: Ib08c29ac147d9e22681931c619ba6df8ea7637ec