Merge "Address leftover comment on aosp/2651440" into main