Merge "Fixed a bug where notifications could become orphaned" into nyc-dev am:...
Merge "Fixed a bug where notifications could become orphaned" into nyc-dev am: ed47cf23 am: e91cf548
am: ba42f419
* commit 'ba42f419':
Fixed a bug where notifications could become orphaned
Change-Id: If0f522e45c1cbd252ccc68c4b6f965c4998c617a