Merge "Fix shift value in dist_block with hbd" into nextgenv2