Merge "[flexiglass] Forward fix for b/325082459" into main