am 153dc4d3: am e2f3892f: Merge "Add \'Remove all then re-add\'." into lmp-mr1-dev

* commit '153dc4d3b7021d63c8595efa5bcc06519498b319':
  Add 'Remove all then re-add'.