Merge "Fix installd test" into oc-dev