A few line ending fixups

Change-Id: I9795518387435e2d79bdad45526c968a71135e2b