Merge "Add the missing unregisterCallback call" into rvc-dev am: eac1cdbba9

Change-Id: I0ee6d122ec309c04861654d112a8444a9263a299