Merge "msm:ipa3: fix the header table gap issue"