Merge "Add TEST_MAPPING for trust directories" into tm-dev