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

Change-Id: I6e28e41595743e614a4f10f6e014673edc4c4bad