Merge "Address API council feedback for setDiscoveryTechnology flags" into main