Merge "Per user, per storage type cleanup to match PM behavior."