Merge "Fix appops TEST_MAPPING." into rvc-dev