Allow trusts to be optional

Change-Id: I76ab6ddac70cccece46bc36d7592d840599c893b
Merge "Allow trusts to be optional"