Merge "Minor cts result schema fixes. `" into honeycomb