Merge "[SettingsProvider] fix server-side Readable maxTargetSdk check"