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

Change-Id: I1e46b63551d6726ef20a7dcaad52ea7e466aa278