Merge "Use Map for DnsSd TXT record" into jb-dev