Merge "make APIs in SettingsToPropertiesMapper accessible from other package"