Fix issue caused by change in field order, bug 44933

Change-Id: I6617e80314ac4b6b72221220fa153214d682bee4
Merge "Fix issue caused by change in field order, bug 44933"