Merge "Support excluding overlays when enforcing RRO" into oc-mr1-dev