Merge "Fix video call from search stripping + prefix"
am: bab3b10693

Change-Id: Ia0fc9db2d9403c2f74ef7269326b2b09967f0bb8