Merge "Revert "Fixes windows error introduced in CL 345105"" am: 179f3947de am: 879c517cf9
am: 10bef3fe26

Change-Id: Icf8f2666008d6aaadb40c60fbf7b392a7de2dac9