Merge "build: update fs_config calls for capabilities change."