Removing \r linebreaks

Change-Id: Id284e9dd67716b3f21bcf68ca19370676b7f0ab4