Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev