Fix column sorting

Bug: 972397
Change-Id: I80f97c6d8853391314ec94d3d48b965371f024cf
Merge "Fix column sorting" into release-0.13