Merge "Possible null pointer miss on realloc"
am: 9bbbaf1480

Change-Id: I8dba5053954efd4374aecce98771b3348ffd073b