Merge "Fix testUpdateConnectedClientsForLocalOnlyHotspot"