am 5139c4fd: am 702a736e: am 31838876: am 9baaa4b5: am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev

* commit '5139c4fd28d1a34981d590f2fbec9b407481ea52':
  Fix NPE due to the lack of null-check