AI 144005: Fix auto-merge method duplication that broke build.

Automated import of CL 144005
1 file changed