Merge "Fix HALs to not have transitive depends." into oc-mr1-dev