Merge "Fix unchecked realloc."
am: 81ce87f0cc

Change-Id: I4313a7be92cd5797d469788a77cb5ce84332db80