Merge "Rename state to avoid conflicting SLS IDs"