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

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