Merge "Fix csit tests of policy/distribution"