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

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