Verify templates continue to work

Change-Id: I599a96731b4458eddbc5eca671995f1437965c90
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Merge "Verify templates continue to work"