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

* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE