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

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