Merge "Adding additional transport satellite support at getSubIdForMobile()" into main