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

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