Merge changes from topic 'sort-order' am: a84782331e am: 79f9e2cf70
am: 6e03f2a7e4

Change-Id: I1a3aae6b0a274f90f67306f234171c7eed5c66ae