Merge "Address comments for ag/26028243" into main