Merge "Fix malformatted preference xml." into oc-dev
am: 569a93b8bb

Change-Id: Ida4d8631bf7f36d68c9022b9ff72cd2ef3cd4995