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

Change-Id: Ia75e1923e7cf6fa7f660d6cff2bf8e91dd85257a