Cleaning of some Derps in Settings (TR locale)

Change-Id: I2d62620657d4c41f43a974f58bcb7543749e8177
Merge "Cleaning of some Derps in Settings (TR locale)" into jb-mr2