Merge "Fix unit test breakages." into oc-dev