Merge "Make sure all public types are defined regardless of build variants" into oc-dev