Fix ordering bug

Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
1 file changed