am 12727b8d: am d7fb1d2a: am f2e53c5e: Merge "Remove BnServiceManager."

* commit '12727b8dbd0a86428d33e12d7f5e76ea281447eb':
  Remove BnServiceManager.