Merge "Add javadoc about APIs requiring uses-feature" into oc-dev