Merge "Address aosp/3541181 leftover comments" into main