Move trusts to extension

Change-Id: I32b32fc5df8d8483ae8e99067f0655c13c6f520b
Merge "Move trusts to extension"