Merge "Update add/removeCallback methods to register/unregisterCallback" into lmp-dev