Merge "8/n: Update biometric utils to have sensorId-specific files"