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

Change-Id: I2739623f1b9dfa7261c79e0986f434643b26a173