am c10eef7e: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev am: 41abc43aff

Original change: undetermined

Change-Id: Ia9799ab70f2469e710e4eceae392cb828a707c15