resolve visual studio warnings around initializers

Change-Id: Id2ad4fb24242f7ca8fa7a152f0889fded4113613
Merge "resolve visual studio warnings around initializers"