Merge "Clean up TEST_MAPPING after default update"