Merge "Rename CONNECTED and NOT CONNECTED to IN SERVICE and OUT OF SERVICE" into main