Merge "Fix casting warnings in ContactSaveService" am: 8bdba9cf9b am: 5126fcd56e
am: 1ada6caf03

Change-Id: Ic7e4d0a193bbc72e7e80f40b2b9bfb4becc65065