Merge "configs: Add FFECNS related changes in xml file"