am 26d5786f: am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread

Merge commit '26d5786fb1a43d82b40fa908e1220a018b748c93'

* commit '26d5786fb1a43d82b40fa908e1220a018b748c93':
  Fix pointer index when splitting secondary pointers.