Merge "Rename PhenotypeHelper to DeviceConfigHelper"