Merge "Remove DispSync default value/docs" into nyc-mr1-dev
am: ff0fd30f88

Change-Id: Ic068ffb596793653ee4b0091f561489312a3b37c