am b99419aa: am 27f80673: am ea496644: Merge "Add null check" into lmp-dev

* commit 'b99419aa1900770c31b76292f6401fe74bd8d671':
  Add null check