Merge "Revert "Rename two targets to have SettingsLib prefix""