AI 146316: Get build working by fixing manual merge that I messed up.

Automated import of CL 146316
1 file changed