Merge "SettingsLib synced by Copybara"