Merge "Explicit remapping of sensor IDs"