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

Change-Id: I9bc738f6bad45e314e077c2250fe3e086571db7a