Merge "Clear identity before calling into the mount service." into lmp-dev