New format makes it easier to parse during CTS testing. Bug: 19225708 Change-Id: Ia9a75ca92b6c10eefcb07cabea9852e514807b08