Merge "Move PackageManager to new auto-doc feature!" into oc-dev am: 0a02259bba
am: 8203c3694a

Change-Id: I4bb0d19647db20e91d06602322fab6914a891d8e