Handle TemplateResouces with the wrong template extension

Change-Id: Ifcd7a5728fcdb61146ad6461697756ea46e9ab96
Merge "Handle TemplateResouces with the wrong template extension"