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

* commit '0fbd9ebab891530290b4d52fd5e81f6b4d7278d8':
  XML parsing optimizations