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

Change-Id: If1061edfde37a49041f52807e19b3ea3c0c100a0