Merge "refactor servicestate data/voice roaming states"