Switch to using template mechanism provided by core.

Dependency: Ie936c974acd8bcf2cb196d8ca34e9056a54a3966
Change-Id: Ic59f01673c74def073e328fd5fd46d8d5c6348ed