Cleaning up the notification data structures.

Change-Id: I2e39fee81a2bd99245b9de6edd2ce5c45bd733c7
3 files changed