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

Change-Id: Ia3037c9b077ad59c4181a684ca94c48df0d6dd0e