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

Change-Id: Ic3c9346849b59c72181dc236b46c9122e8d17a91