Merge "Support excluding overlays when enforcing RRO"