Merge "Fix UDFPS enrolling crash" into udc-dev