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

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