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