Fix build error after merging

Reviewer: Dan Jao (post-commit)

Issue: None