Split redlinking out of Templating class

Change-Id: I547ae6b7625ae8462394e6c2efec1f30e9afb1ae
Merge "Split redlinking out of Templating class"