am 84e533d7: am 228f8261: Merge "delete_file() should force removal." into lmp-dev

* commit '84e533d7b06de2dfd2a40b577ef22877e0e499af':
  delete_file() should force removal.