am b7ac0d02: Merge "Fix ProxyHandler to only run when needed" into klp-dev

* commit 'b7ac0d02d666fb3483b42c291cd3a193d7ca8154':
  Fix ProxyHandler to only run when needed