am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev

* commit '341666c40d222145f7dfd44bdbed48590c4dc5da':
  Fix sync problem in NsdManager