Small re-factoring in template_resource

Change-Id: Id416595c531db8510d9fd88d1573372f3c4934eb
Updated from global requirements

Change-Id: Ifce77584f9f29418f3b3ca47ca6fa001ded904dc
Merge "Updated from global requirements"
Merge "Small re-factoring in template_resource"