[automerger skipped] Merge "Only going to use the defaultPhone instance if it is not null." into qt-dev am: 57eaf864b0 -s ours
am: 30e8432482 -s ours
am skip reason: change_id I16076b712ea53b5cbe9a2646b78ba5f515410beb with SHA1 ab94770df0 is in history

Change-Id: Iebe90026086627c3c007759966a6fed34611fa9d