Merge "Fix issue where line breaks would be wrong" into pi-dev
am: dd49a8ccd7

Change-Id: I144652e4ae256ff714e919f040e180aa64081584