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

Change-Id: I5535731dcf6adcb4a3a5ecb5c0423bf5025012d1