am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit 'b294a97a6fed15d379ce11084166780e7d9dd883':
  DO NOT MERGE Fail more gracefully on allocation failure