Merge "String changes for Location services Settings screen Bug: 5098817"