Merge changes from topic "am-823a49e64a9544bb91a58708df530bd0"

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into tm-qpr-dev am: 1d2c085a47 am: 88e6291165 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings am: f60e5a4b7c am: 4f11a48bfc -s ours