Merge "Revert "change KeyphraseEnrollmentInfo to store services""