Fixing crash on allocation
am: 6cac55670e

Change-Id: I52e05226da478fdd7236894f1e65f4986c1d5f3c