Merge "Clean up SharedPreferencesLogger."