Merge "Add concept of implicitly exposed components" into oc-dev