Merge "Update all yaml template files in aaf"