Merge \\\"SyncOperation float cast fix\\\" into nyc-dev am: 5f72b129c4 am: 0d27e2d624
am: 64b333c3c0

Change-Id: Ic046229411c7fb1e88e430fddf3b9c128c05b241