Merge "Package installer related changes to javadoc" into oc-dev am: 52312298b6
am: a2450bacdc

Change-Id: I7bf7b87bfc5f4eb71b8cc1177375c257e5c79499