Merge "Fix broken robotests." into oc-dr1-dev