Merge "Add TEST_MAPPING for LightsService" into rvc-dev