Merge "Transfrom connectionState to string" into tm-dev