am 3f49e65f: (-s ours) am b0362b1b: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit '3f49e65fc3de05bfb2e54d74f8366c6be342d0b4':