Merge "Unescape strings properly in NsdService." into lmp-dev