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

Change-Id: Ib8ce6520413e887a7b9fdab0487e7b57df4133c2