Merge "Add hwservice_contexts and support for querying it." into oc-dev