Merge "Fix sync problem in NsdManager" into jb-mr2-dev