Reordened

Change-Id: I2c0a3596ceeb921a33672b46187cb2147e818206