STYLE: Keep the text in the margins

Change-Id: Ia08ad4c0e4ba804fe567e2733b757b68dccb5681
Merge topic 'filenames-outside-margins'

1bc07a6d STYLE: Keep the text in the margins