Merge "Remove the block size alignment restriction."