Merge "Add delay for hanging up number verification call" am: 07ad80c01e am: e9c3f7359b am: 3d8db53f85
am: 9a142cd1b8

Change-Id: I37ad7da43ea0e273424666407fe693c01473176f