Merge "Fixed a bug where a removed notification would stick around" into oc-mr1-dev
am: ba55894ec8

Change-Id: If767d72496dbabb59cb500e2763928f7a21198bc