Merge "Only align when necessary" into nyc-dev
am: 1ccfe52630

* commit '1ccfe5263008991aeff10964da3bdc6c2c1c1d06':
  Only align when necessary

Change-Id: I2452df91a9c97a0b7d2d182165384d63ce040a09