Merge "Fix for managed-profile users needing to "install" packages twice."