Merge \"SyncOperation float cast fix\" into nyc-dev
am: 5f72b129c4

Change-Id: I907544c36783e192a17a2aa7f629a3093a516de2