Merge "Update the GrantTrustResult to remove static factory method." into tm-dev