Merge "Clean up permissions when uids are no longer used"