am 38c65b1f: am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered"

* commit '38c65b1f70042bc8e37e91106692158f0ce98703':
  MountService listeners can not be unregistered