Not reviewed. Forgot to land build changes for non-mac platforms.