Recompile templates

Change-Id: I8b167eeea61f3610c563d63894e8b67ed6a2b699