Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d
am: d1fb914324

* commit 'd1fb9143244dcb46b28a0edbae88f8f5815d31bf':
  Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: I0eca2b999be91c6c38df392ef62a4177ce20069f