Merge "fs_config: move sort to be consistent with other sort" am: 052a01958c
am: c06559eb7b

Change-Id: I2acabfd1f5912da126dbc31559e3b458810e75d0