Merge "Merge "Fixed a bug where notifications could become orphaned" into...
Merge "Merge "Fixed a bug where notifications could become orphaned" into nyc-dev am: ed47cf23 am: e163ac23" into nyc-mr1-dev-plus-aosp
am: 802ce755
* commit '802ce755':
Change-Id: If056fd824fab632391462705345f4a9c384bf4d3