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

Change-Id: I9aa9f77d224fdd63ec4c2222c510d1958e4f7166