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

Change-Id: I69457f9a26085bc98e24b0c975106ddaa3199e98