Update TemplateData to master

Change-Id: I3caa5242be5ef623146a0f50518e0e8f747b447f