We were incorrectly using the OptimizeLayer and bypassing the COD layer. (cherry picked from commit 1e16272b)