Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev