Merge "Cleanup USER_OWNER in a11y service and tests"