Merge "[SettingsProvider] update API javadoc"