am d2534f8c: Merge "Don\'t remove restrictions files that are valid" into klp-dev

* commit 'd2534f8c05ccdf692f1e265ae719b67290d15050':
  Don't remove restrictions files that are valid