am 8fe00fb8: am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev

* commit '8fe00fb8658c49a4bfd6e5bb4665d91f3879fcf6':
  rename add/removeCallback to register/unregisterCallback