DO NOT MERGE Don't crash if already unregistered

Bug: 155284432
Test: manual
Change-Id: Id04ab9093b9cd4c837058442a8d0e04ff4dde051
1 file changed