- Fix build errors from the next change Approved by: doceng (implicit)
Approved by: doceng (implicit)