Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e
am: 3158673eeb

Change-Id: I2001475c549a1ecf1dec7e469bddc3a22ce86b57