DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a...
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service. am: 29154b00 -s ours am: 6e8a33a5 -s ours am: 6771c6ab
am: 6c6a790d -s ours
Change-Id: Ie5b45503c2917340397abdbd6df5ecc407d90c26