Requested by: Dan Langille Approved by: gabor (mentor)
- Fix build errors from the next change Approved by: doceng (implicit)