It's easier to parse visually when those assignments are ordered.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@huawei.com>
Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>