Merge " Failed to show hold call when user click swap and merge simultaneously" am: 017fa0a742 am: fe0fb0e663 am: 307fdf3941 am: 92d0181edb

Change-Id: I80e0876899f0812578bfcaeadc7b795e18e11425