Fixing crash on allocation am: 6cac55670e
am: c760968838

Change-Id: Ibba05bc30b478fb51e09add93227c008be90db93