cleanup trusts in controllers

Change-Id: I1eff618d1e6cef2eb10ae7e737b0ca0beaca1d4d
Merge "cleanup trusts in controllers"