Merge "fc_sort: Fix leaks" am: 7f4b2ad584
am: acbf2ad328

Change-Id: Ic59386f9a2a02438299ee11f3b36fdd7b9b34c99