Merge "Add test mapping for Overlayconfig"