Merge "Fix consumerir test bugs" into oc-dev am: 9f0b8369e9
am: 601ae82ebc

Change-Id: I2853357573153e2a0af5b3a61b9b7042cb950219