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

Change-Id: Iba0a059c822d74bd756a3988757040239e69fa8e