Merge "Mark config as non-translatable" into rvc-dev am: 2670dd30c5 am: 087d7f0ce9 am: f7e24a6968 am: a50f010e12

Change-Id: If5590f5323e77853ba13be13082b201fae3cc7bd