Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev