Merge "fs_config: move sort to be consistent with other sort" am: 052a01958c am: c06559eb7b am: 15e654392a
am: 084d5b9678

Change-Id: Icbcb7ad0e36d45cedd90630367f987fce5a39a42