A few sync changes

Change-Id: Ib50c428857c83feb739df316324d9498e821e166