Merge "Fix entitlement check results" into udc-dev