Let local templates override core templates

Bug 1328310

Change-Id: I06dd8986da6388a6b7f2033270f503aeaab044dd
Merge "Let local templates override core templates"