Merge "sdm: re-order the mapping of fd"