Merge "Add hwservice_contexts to default builds." into oc-dev