am 53278235: Merge "Support non-standard ports in EAS" into jb-dev

* commit '53278235bb6efb043019e1131bb88054cef2e1c9':
  Support non-standard ports in EAS