Merge "update dac legacy templates for N release." into nyc-dev
am: c5a1c1b3c4

Change-Id: Icd3232500aaf51bd6144d4307a7bb0b8055e09c3