am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."

* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
  Handle stopping of services with still bound applications.