Update TemplateData to master

Change-Id: I2ae1fc68f48767e73b73fa9ca5a438b93b01cce8