Merge "Fix entitlement recheck fail in U"