Merge "Package installer related changes to javadoc" into oc-dev