Merge "set translatable as false for config file" am: be0d85340b am: 7d40efd6d1
am: b2d9a3e5f8

Change-Id: I78d0f50be0feae6dc6d220e827741af390a08b65