Merge "Add mainline TEST_MAPPING to run S module on R base image"