Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7  -s ours am: c15dd4ee9b  -s ours
am: 5b3bc0e1d8  -s ours

Change-Id: I09fcb2c2270b17a4de1e2f19b5c6f0cf37bd0758