am 3c902a62: Merge "Avoiding cyclic references when unbinding from a service"

* commit '3c902a62eddebc75adb5286e55e1107e0b63551f':
  Avoiding cyclic references when unbinding from a service