Isolate GsPackagePolicy changes to 3.2.x so things work again in 3.1.0.x.