Reapplied the change related to selendroidPort to resolve merge conflicts