Merge "Fix UDFPS enroll when help received on first step" into sc-v2-dev