Fix windows test failure due to newline conventions.

Change-Id: Ia9f55d0af10e7ab58114c5c627949897a3ae8896
Merge topic 'newline-failure' into master

596f2fd1 Fix windows test failure due to newline conventions.