Merge "Remove TODOs for b/336581871" into main