Merge "Add test APIs for policy size tracking" into main