Merge "Fixed a memory leak with notification children" into nyc-dev
am: 9688c2edc9

* commit '9688c2edc962a0d2ef983d4b5cf99be2c764ddb1':
  Fixed a memory leak with notification children

Change-Id: I41ea616cf23f37c3cd818552f2431c69f464b426