Merge "Update SharedConnectivitySettingsState per feedback from API counsel" into udc-dev