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

Change-Id: Ie2e36ecbed3024352f71a8b9da3535bdd140aa23