Merge "Remove EXCLUDE_FS_CONFIG_STRUCTURES"