Change initializations to be compatible with MSVC Change-Id: If5473dadc40d3caea61953fbd112a01939dc1183