Merge "Address comments at aosp/2658225" into main