am 217b32e4: am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev

* commit '217b32e46f50dfc96d22ab07b7813240c7f1b9e9':