Merge "[A1Policy] Uses new tpls for repos / images"