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

* commit '9411b61877d1a7416ae00f16bd359a963dc948ed':
  Add 'Remove all then re-add'.