Merge "XML parsing optimizations" into ics-mr1