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

Change-Id: I40ccc8ae8f134b0b7789692cfebba168da2b88d7