3.17. 3.18 compilation fixes.

Summary:
3.17. 3.18 compilation fixes.

Test Plan:

Reviewers:

CC:

Task ID: #

Blame Rev: