Merge "Javadoc update for permission requirements" into oc-mr1-dev