Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7
-s ours
am: c15dd4ee9b
-s ours
Change-Id: Ib0cbd32dc877e3863de88bdebd26c693235e1c1e
This commit is contained in:
e3f322dfc7
-s ours
am: c15dd4ee9b
-s ours
Change-Id: Ib0cbd32dc877e3863de88bdebd26c693235e1c1e