Merge "fc_sort: Fix leaks"
am: 7f4b2ad584

Change-Id: I3c10871ddc11f43f685ef4a7064d416a1ca450f1