am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev

* commit 'c03cf67eb55cb1a228e5c915ac4eb8f113a5af54':
  Fail more gracefully on allocation failure