Merge "Address comments on aosp/2765367" into main