am 68ca1464: (-s ours) am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE

* commit '68ca14648c88d84080cafae02c9bc5cf3448096a':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE