Reorder data for User Data graph

Change-Id: Id89949cdb1c37531983436a777a4c97c1fcd7f14
Merge "Reorder data for User Data graph"