Merge "Fix unchecked realloc." am: 81ce87f0cc
am: 0e0e1724f6

Change-Id: I6b169da16dc81b4a4c35c3e744e1e424df6bf4c9