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

Change-Id: I700a2f280fea76a480c16a6f2ff40fc15a8c362e