Fix consumerir test bugs am: 43e1c6bc55  -s ours
am: 6b48816cac  -s ours

Change-Id: I95996e4c318a7097acbfdb68de8e315cca2d8336