Fix newline derp

Change-Id: I21a3faca37406dd60550cba6383b1e85f80ab0f1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1