Merge "Replace hard coded numbers with TX_SIZES macro" into nextgenv2