Merge "Add TEST_MAPPING to c/a/server/TV"