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

* commit '47235e8b5ce6c622a1182933404cf5a17fcd35dc':
  MountService listeners can not be unregistered