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

Change-Id: Ia0efa500b79ec1ea935563a65225bb0f43d163fe