Use DataModel references in ResultBuilder

Change-Id: I7bdc0fdee029cadb6d3e9efc535d216ae84219b7
Merge "Use DataModel references in ResultBuilder"