Today
Cherrypick CS110544 compile fix (unsure why it didn't show in this branch originally)