am 8ff6d70d: Merge "Clear identity before calling into the mount service." into lmp-dev

* commit '8ff6d70d44626cd515f517962378d89ab3954979':
  Clear identity before calling into the mount service.