am cffe8532: Merge "Detect allocation failures and bail gracefully"

* commit 'cffe85329285eb03eebf7cf51fa4ef55fbc6d7d8':
  Detect allocation failures and bail gracefully