Merge "Remove dead code in RuntimeMappingModule"