Merge "RRO: Added partition policies for overlays"