Add forgotten templates during templates refactor

Change-Id: I59593194a98763401015aaf1d51379d8daef9cdf