am 2d58c922: am 798c0552: Merge "NoMan: Update effect suppressor on listener...
am 2d58c922: am 798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
* commit '2d58c922':
NoMan: Update effect suppressor on listener remove