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

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