Merge "Don't remove restrictions files that are valid" into klp-dev