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

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