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

Change-Id: Ia49d5b1d206fbbf7d083620a3dbfe4744f9a9a24