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

Change-Id: I83e6fa02991277081b843e7183d83befb7a11778