Merge "Fix template support."
am: 96e15c9e7d

Change-Id: Ic9d5822a6420a3c5dd0378e75ab9203b708fdf99