am 90cadb35: Merge "MountService listeners can not be unregistered"

* commit '90cadb35156829ff1d6b7066409596da38fc70e1':
  MountService listeners can not be unregistered