Merge "Remove AdoptableFeatureConsistentTest from TEST_MAPPING file." into rvc-dev