Package templates correctly

Change-Id: Ia6f797169f6b5a3cd29b1bcf07d7f3750b5e3b73
1 file changed