Merge "Fixed an issue where would could be left with empty notifications" into oc-dev am: 25e509462f
am: b8c7c9ee2d

Change-Id: I8560e900e1c0c2cf7caf1ba748a5b928ff69f638