Merge "Cleanup dont_read_policy_definition flag" into main