Change order of fields to match with internal

Bug: N/A
Test: N/A

Merged-In: Ifa96f19117a32bd067629c46193d51331afe17f9
Merged-In: I826e40de6b25124ec9b9f9bf6115b0ee800c4169
Merged-In: Ic546f6869984c2df7e9deaf9d7b87d2195406f23
Change-Id: I38e7c035b1894fea949fed1026aea8698fe805f3
1 file changed