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

Change-Id: Ie93f3d900a424e84848050e8dcd812b0aee75ab5