am 7afb217e: am ee2da343: Merge "Remove dead blocks for the blocks_ array."

* commit '7afb217e1d3468e9b7138c6929000c2fac2ad795':
  Remove dead blocks for the blocks_ array.