Use trusts in the assembly

Partial-bug: #1313948
Change-Id: I064070f36927eb0a823fda3e139d37485718c126
Merge "Use trusts in the assembly"