Merge "restorecon hwservice_contexts." into oc-dev