Reformat default templates to remove extra line breaks.

Change-Id: I667834d102b3622d0fe0b272bcb2d2f195b9f2bb
2 files changed