Merge "Remove PMS dropNonSystemPackages" into sc-dev