Merge "Fix casting warnings in ContactSaveService"