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

Change-Id: I279f8f186304b44b2a1e003deee414d9db09199d