also fix a few TODOs Bug: None Change-Id: I2d287ed1a58f71ef32d5dc5624879ae8c63348b5 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/370122 Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43485}