Review fixes.

Test Plan:
Same as for 7ff79ef

Auditors: alex, alpert