Merge "Fix-forward for breakage introduced in b/29732496." into main