Merge "Non-rd variance partition: Adjust logic for 32->16 force split."