This handles the case that was missed inIt turned out to be error-prone to expect the r322473 and fixes the assertcallers to handle that - better to
mentioned in PR36524.
TODO:leave the decision to this routine and make the required data to be explicitly
- See ifpassed to there are other function.
This handles the cases that need to bewas missed in the r322473 and fixed.es the assert
- Try to slightly refactore the code to make this logic cleanermentioned in PR36524.