Merge "Allow space management for device admins" into klp-dev