Missed some template update

Change-Id: Ide3efd18dcf779aea2c625248b34fbbda083d7a2