Add back alignment

Change-Id: I8532500102e404e2cefafbdfe3242d23bb33e10e