Merge "Make networkstack-client visible to Wifi service test"