Merge "Remove TODO(b/347269120)s as they will no longer be done" into main