Fix consumerir test bugs
am: 43e1c6bc55  -s ours

Change-Id: I3b957640d1a3a76771eacd413702950aee61665b