Merge "Add PACKAGE_USAGE_STATS permission to shell." into oc-mr1-dev