Merge "For non-udfps, detectFP if primaryAuth required"