[automerger] Fix consumerir test bugs am: 43e1c6bc55  -s ours am: 547deb7528

Change-Id: I51be263ba76e99c2871e1d1dc3f1a0ba869c1b76