Merge "[Trust] Add test target for tablets." into tm-dev