Minor reordering

Change-Id: I57b1f1e704908771952e1e4a5ae9b71a543d1bb5