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

Change-Id: I5b621ce7b89e8853dbb9abd2e14ec1020176936b