Merge "FrameInfo header fixes" into mnc-dev