am b8811919: Merge "CBS : Update the "Delete All" display."

* commit 'b8811919bee383b5ef3f6dde88071b1daa16ab5f':
  CBS : Update the "Delete All" display.