Cosmetic cleanup to templates

Change-Id: I131527243409a72693d08151a162f0e5f7eb0153
Merge "Cosmetic cleanup to templates" into production