Merge "[multi-part] Enable bidrectional sorting" into nyc-andromeda-dev
am: 19b0d5a015

Change-Id: I6a9d50098eaccc8d4b13e93ec1aa0a49b5d35fc1