am 68fcda9a: am 4c80f99c: am 2e941e40: Fix allocation failure crash

* commit '68fcda9a884cefe7530d2306bc39ce185ebd1660':
  Fix allocation failure crash