revert use PhoneNumberWaiter when NPE

Change-Id: Idce1d5b52ad24b88800cdb2a68f6617acde46a66