Merge "[Thread] resolve open comments for aosp/2737373" into main