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

* commit 'd7fb1d2a5bed8941c8bc21ed50f6a129c2ebef3d':
  Remove BnServiceManager.