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