Merge "Temporarily disable QTI_BSP route" into LA.HB.1.3.9