[automerger skipped] Merge "DO NOT MERGE Don't crash if already unregistered"...

[automerger skipped] Merge "DO NOT MERGE Don't crash if already unregistered" into rvc-dev am: a9f4e2d2 am: cee20d0e am: 7b3a6f36 am: b2b1281a -s ours

am skip reason: subject contains skip directive

Change-Id: I4b9387f7e1efe17a7dc9d54603892b5965a608b6