Cleanup TranslateSettings

Change-Id: Ieaa642ce313ec55c08ed9c7de64ff81ba96e46e8
Merge "Cleanup TranslateSettings"