am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1

* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
  Avoid inconsistent state when remove fails.