Merge "Fix stale realloc pointers." into jb-mr1-dev