e7f82ec533
am: 668661452b * commit '668661452bc04ecdce274170906b9790d23ebd6c': Fix a regression in SettingsProvider
668661452b