Merge "Fixed a bug where notifications could become orphaned" into nyc-dev
am: ed47cf23e8

* commit 'ed47cf23e89c8af296d69464ac04996fbd7ee9a9':
  Fixed a bug where notifications could become orphaned

Change-Id: I39739574e87d758a5cffac5a51db075e6e782bcc