Fix bad automerge

Test: none
Change-Id: I8281adc2b5675d21549b8cd9f2a1993be94eab15
1 file changed