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

* commit '21d8baf492007cc01545905de33ecefe5d947843':