Merge "Move NsdServiceInfoTest to common tests"