Merge "Ban core components from accessing vendor data types" into oc-dev