am 9b06ca94: (-s ours) am 8f393645: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit '9b06ca9476e93f4a4e86b84d080df35a333dc0ac':
  [DO NOT MERGE] Revert "Update string in Settings"