Merge "Repair header from the modem in testapp"