Reformat default templates to remove extra line breaks. am: dd8883ca30
am: b39c2051f3

Change-Id: I4597ab45ca825c5a951936776d0017c129705f02