Merge "DO NOT MERGE - Fix stale realloc pointers."