Merge pull request #13328 from eileenmcnaughton/phone_handle