Merge "Fix robolectric test failure" into oc-dev