Merge "Fix entitlement recheck fail in U" into udc-dev