Merge "RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment" into sc-dev