Merge "Add TEST_MAPPING for ahat."