Merge "DO NOT MERGE Output XML version of cts coverage info" into jb-dev am: 64dc3e3615  -s ours
am: ef28b4a3b0  -s ours

* commit 'ef28b4a3b08b5d703543b719722ee708cf88931d':
  DO NOT MERGE Output XML version of cts coverage info