am a4828d99: am 4e14da56: Merge "FrameInfo header fixes" into mnc-dev

* commit 'a4828d999a9241c26c4f007308ed5cd383418fe9':
  FrameInfo header fixes