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

Change-Id: Ia5c861ea922eef0c525d150f0542c33734e359db