Merge "Adds caller check to getAllPackages()" into oc-mr1-dev