Merge "Turn off some more warnings on Windows." am: 20fdad0a68
am: c918745817

Change-Id: I15bb46eaaf602303cbde158aaa9140896117175a