Merge "Add additional MNC overlays" into klp-dev