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

Change-Id: I94b5b96b6acef944d073fc6dcfbc71f5caf074ee