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

* commit 'fc005f52578ed9fa3ea34fa5f29085b25a9ff566':
  Unescape strings properly in NsdService.