Merge "DO NOT MERGE Don't crash if already unregistered" into rvc-dev am: a9f4e2d2 am: cee20d0e am: 7b3a6f36 Change-Id: Id507e939b3dbc124a4dd085cfe2ddf286eaa9552