Fix consumerir test bugs
am: 43e1c6bc55  -s ours

Change-Id: I49896cd8abef15d4bcda1653f8e38b645a48fc41