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

Change-Id: I1d5becac2732f7a8c92d406c94b29dd8b78a5a19