Merge "Update default DispSync offsets" into nyc-mr1-dev
am: 0c083d43f2

Change-Id: I93de11437b64aa930f8edef39e0d86ccdbb532e4