am b2b1ecd3: service: Fix bug in RemoteCallbackMap

* commit 'b2b1ecd3c282412773f5ca70ee2798542bc2920f':
  service: Fix bug in RemoteCallbackMap