Support Older XML Formats

Bug 5844154

Change-Id: I8f0daba15072aa0ef4169354eabfcbea85062148
3 files changed