am ac457b1b: Merge "Fixed a crash in the Notification expandHelper" into lmp-mr1-dev

* commit 'ac457b1baef7904b05c47f653d11f20b860afccd':
  Fixed a crash in the Notification expandHelper