Merge "Comcerto: Only change text offset when DMA NCNB is enabled"