Merge "Fix TrustAgent showing unclear string." into tm-qpr-dev