Settings: Set untranslatable

Change-Id: I0702378bab455a7ccf95a174e36bc792d26feec8
(cherry picked from commit 61d27e63143d833cf8669e235f5651add172774d)
Fix upgrade to latest proguard

Change-Id: I3fc77adc895e98673005e89bb99a38744f01bb97
(cherry picked from commit b4c8ae1e137093c666b6b56613bdfd6f623c2e50)

Conflicts:
	proguard.flags