Merge "Stop relying on global GCE_PLATFORM_SDK_VERSION"