reorder items

Change-Id: Icdc5386549e942a8944d3753621ad6a7c9768b27
Merge "reorder items"