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

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

Change-Id: Icc50140af2be266f86586b3b78f1c08a5793030d