Merge "Refactor SfpsEnrollmentFeatureImplTest" into main