am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

* commit 'a3404263c08c711fa5f2d73a92ec7c6f366b9338':
  Fix NPE