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

* commit '3804ebfbf9764a32d3d7e79ac95f3995db5e5117':
  Fixed a crash in the Notification expandHelper