Merge "Remove plane_block_idx."