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

* commit '24a16e6c53d9b45c0cfdf150425002adc919955b':
  Unable to push files to Windows 7