Fix for multiply defined variable in non-unity build. #codereview matt.kuhlenschmidt [CL 2419681 by Ben Marsh in Main branch]