Merge "Cleanup hidden API usage of voip-common."