Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b
am: 7ab2da1243

Change-Id: I9857f2f6d6b783acf6235aa4c88be2e1ad6640cf