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

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