Merge "Add the missing unregisterCallback call" am: 7b15fd373e

Change-Id: I77e350b21314f761d0a0fcfa9570ae6b7bad90d3