Merge "Conditionally disable NetworkStackApi33Shims"