am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1

* commit 'c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
  XML parsing optimizations