Update template syntax for 3.2

Change-Id: I3839357f82ebca0ae1d7b3b2f4765d6d7b220773