String fixes for Settings.

Bug: 18359513
Bug: 17659522
Change-Id: I4645c1e615661613c22b86981ede34327da51aab
2 files changed