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
Change-Id: Id16463e4621b4012cc6c7c2bf5d7b2cc07de1b0d