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

Change-Id: I1f41744ec2cc5d820e7381858d5974b17db8d893