am ee1c033f: am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

* commit 'ee1c033f6e0c2e709bd63adb419de3c5212fdf8f':
  Unable to push files to Windows 7