am 732f4f72: am bd6f4a81: Merge "Ensure trust agents are disabled in...
am 732f4f72: am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev automerge: 98a8258d
* commit '732f4f72':
Ensure trust agents are disabled in safe-mode