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

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