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

Change-Id: I10256e0e19e07f0636561a202cd5a5f38a59047f