sync fixes

Change-Id: I8320a85d521767daa916bdbd9ef8c8f0c15c4eac