Merge " Failed to show hold call when user click swap and merge...
Merge " Failed to show hold call when user click swap and merge simultaneously" am: 017fa0a7 am: fe0fb0e6 am: 307fdf39 am: 92d0181e
Change-Id: I80e0876899f0812578bfcaeadc7b795e18e11425