Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7
am: 8d62516e89  -s ours

Change-Id: I64db01eb7d3d9f2fd6e951383b62f79032c7f9e4