Move trusts to an extension

Change-Id: I4a25055efe81eec231180472be92733d86b77c68