Merge changes Ic1ce346a,Ic0b4e92c * changes: Simplify model_rd_for_sb HBD ifdefs Simplify dist_block HBD ifdefs