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

Change-Id: Icf53dae32e9175674d6269e57e34dfdbb2fc4248