Fixes to get optimized build working again.
Testing Done:
Issue Number:
Approved by:
Reviewed by: