Merge "Fix malformatted preference xml." into oc-dev