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

Change-Id: I3d503ca669d532d2979f9a4876d0754179efb342