Merge "Update macros as needed for rewrite of templates that make them re-usable on both DAC and DevSite Depends on CL in build/tools/" into mnc-docs