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

* commit '702a736ede853074993eb286085dd244161c8f29':
  Fix NPE due to the lack of null-check