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

* commit '3a8acf0a5acdf31767a2f73ff83d616eed6f1f22':
  Fix ProxyHandler to only run when needed