Move to neutral template

Change-Id: I15a1d146c9578972816d98fc28961fa94f34c904