Merge "Tuner Default HAL Fix bug in TS size calculation"