Merge "Replacing raster_block with block in the encoder."