Merge "Mark config as non-translatable" into rvc-dev am: 2670dd30c5

Change-Id: I66b57ec62062e9b9cbde6adc94f1847f0d9c1f79