Merge changes from topic 'sort-order'
am: a84782331e

Change-Id: I66c6ba832bb09b53fbadb2e2d4c212d1b33d3ecf