Merge "Some cleanup of incoming call latency."