Merge "fc_sort: cleanup warnings caught by clang tidy / static analyzer." am: ce3b2a41 am: 1e5aca27 am: cc0f8875 Change-Id: If9cd331c8899c532ea8c28f6456f84f9e6678685