Add missing templates

These should have been committed earlier

Change-Id: I0df7ed2067fe1e83ca606b08043ed63260e16dbc