am 98743d2b: (-s ours) am f2bc81da: (-s ours) am fd729de5: (-s ours) Merge "DO NOT MERGE - Fix stale realloc pointers."

* commit '98743d2b3d1df3c9937c89d7fdb3952558f61330':
  DO NOT MERGE - Fix stale realloc pointers.