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

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