Use the WEB client when a potoken is configured, otherwise try with Android test suite if there is no potoken configured. This PR reverts some of the changes made in 4928 Related to 4734
Use the WEB client when a potoken is configured, otherwise try with Android test suite if there is no potoken configured. This PR reverts some of the changes made in 4928 Related to 4734