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

Change-Id: I8b80da001d23932c48e9721ee1f23850cf4dcb31