Merge "Update default DispSync offsets" into nyc-mr1-dev