Fixed indentation and typos in comments
Fixed embedded windows tests that were failing following
Merged from branch bug-7703f947aa