Merge "Refactor codes of the definition of ForwardedPorts"
am: c193ed9358

Change-Id: If754256ad4e3a3aaea5d06f03f256c5ad8b5d897