Merge "fs_config_generate: README" am: 058e2f7b19
am: ccf3fcaba0

Change-Id: I5f51fdbaf65d919d3173a35c473f288bcce0a6b7