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

Change-Id: Ib8949fe95c3f02cc951f357e0f6cbae154e31d95