Merge "Remove fs_config_generate()"
am: 45f79b1c3b

Change-Id: I5bef71ab65fd45daa94fc16aebb2d8258ce9b275