Escaped < and > in field values, to avoid messing up XML

Change-Id: I70e422ec49551cb0ec55685503711ed5cb1e76e2