Merge "canned_fs_config.cpp is written in C++"