Merge changes from topic "canned_fs_config_sc_mainline_prod"
* changes: [automerged blank] Merge "canned_fs_config.cpp is written in C++" am:badd64bdbd
am:cfce587a2c
am:960bd432f1
am:e598194cbf
2p:5370c1b176
Merge "canned_fs_config.cpp is written in C++" am:badd64bdbd
am:cfce587a2c
am:960bd432f1
am:e598194cbf
This commit is contained in:
commit
f1b606d01e