Refactoring json and xml reporting

Change-Id: I9acc6c308833fd8ae0d1872d9165be2686524613
Merge "Refactoring json and xml reporting"