Tagging for holly->mozilla-aurora uplift CLOSED TREE DONTBUILD