Merge "Ensure policy has no absurdly long strings" into sc-dev