Merge "fc_sort: rectify with upstream"