Cherry-pick from master: Special XML tag to format the Agent exceptions

Change-Id: If7f1431b12cb54c2310161c1c82a4efe74cdde5e