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