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

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