Merge "fc_sort: rectify with upstream" am: adef499d29 am: 9b1affaa07 am: 6091bbc363
am: 71ebf07cfd

Change-Id: If8b4ae62e526493bade39463e736b57998460358