[multi-part] Enable bidirectional sorting
am: 61f564beac

Change-Id: I2ac09f0de3dd6daec6b659ea0122806389dd668b