Merge "Update SUW biometric string product" into tm-dev