Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev