Merge "DO NOT MERGE Don't crash if already unregistered" into rvc-dev am: a9f4e2d2d7

Change-Id: I5a23ee32fd268cb18330e12559c76001d7b0e967