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

Change-Id: Icbb320a5baa0acc4232e20ef26b38b97db6b524e