am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev

* commit 'f9464838fe141aac1c677e2f4ec0133381fbb5af':
  Guarantee that PAC Local Proxy owns Port