Re-Order

Change-Id: I03f38c473d6f561d3a2756eaf2472a79fb5d3af6