am 0a6a05cd: (-s ours) Merge change 7598 into donut

Merge commit '0a6a05cdb57561e2d932a62a018c83ca5667f4da'

* commit '0a6a05cdb57561e2d932a62a018c83ca5667f4da':
  DO NOT MERGE - Disable settings backup in Donut