Merge "Auto enable new system trust agents" into tm-qpr-dev