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

Change-Id: Ie0aa012d798d5d1df148b4009bae416db0b42caf