Merge "change KeyphraseEnrollmentInfo to store services"