am a79501cd: am af89d7e2: am bffd4d43: Merge "Check return values for null." into klp-modular-dev

* commit 'a79501cd3843149f0759bd53d310cf97d4ee1c8d':
  Check return values for null.