Merge "Stop using deprecated methods." into ub-contactsdialer-i-dev
am: d051757d49

Change-Id: I2b9285777b04f65c56ed5bad71f462a00fc0af28