Fix alignment (again)

Change-Id: Iea4328db1c8074f89acbee015b0ae938652d3fbf