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

Change-Id: I44a8bf1ec103cc6a2cef4ffc0f5e510dd84a47da