Merge "Decouple Dataset ids from SaveInfo."