Fix stuck automerge.

Bug: 28845064
Change-Id: I0d6b43d293c9ef72c9ce2e65c60093bd37a7dbc4
4 files changed