Merge "Update udfps location based on the AuthController UDFPS location" into udc-dev