Cleanup merge artifacts

Change-Id: Ieba80b823e62adff0b98c78ca095fb2347f9acdf
Related-Prod: PRODX-5741
1 file changed