am c3fdc5f8: am d1eec0de: am 86f97fe0: Merge "Add missing null checks after allocations."

* commit 'c3fdc5f843c0922df821425caa03c8cc074f6e8d':
  Add missing null checks after allocations.