Merge "fc_sort: Fix leaks" am: 7f4b2ad584 am: acbf2ad328 am: 274c4e3352
am: d1e5758596

Change-Id: Id89668b9af701e98dfa305439cd7233205082161