Merge "Misc fixes for notification" into oc-dev am: e3f322dfc7
am: 8d62516e89
-s ours
am: 411e99a793
-s ours
Change-Id: Iac2feeee7ab758c9534522bf49b8aaa7f20620aa
This commit is contained in: