Merge "Update TrustAgentService API after review" into lmp-mr1-dev