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

* commit '6211065723d22048694b4854c904683c4ba86268':
  Add null check