am 97f6618f: am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"

* commit '97f6618fb3eae850945decda725151baa9388aca':
  Fixed data offset at parsing IPMP Descriptors