Ensure chosen phone account is used if it is valid. am: b8ce2aa67d
am: 069eba626c

Change-Id: I5848301578fff3c05b6d575db7c44ae64cc94cf5