Merge "Catch RuntimeException in NMService notifications" into jb-mr2-dev