Merge change 22661 into eclair

* changes:
  SettingsProvider: Fix botched merge from donut to eclair.