[automerger skipped] Merge "DO NOT MERGE Don't crash if already unregistered" into rvc-dev am: a9f4e2d2d7 am: cee20d0e47 am: d750d11d16 am: 665a954a1b -s ours

am skip reason: subject contains skip directive

Change-Id: I08c43c985be4512f42ae019e60c17bb272e91c59