Merge "Only going to use the defaultPhone instance if it is not null."
am: 95137f0fd3

Change-Id: I31b98950427a195bcf5bd8557b1aec0b4515b51d