Merge "Passing block index explicitly instead of using get_sb_index()."