Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev am: 879d09f946
am: a634f425d9

Change-Id: I2fd8ddc6166f00d03a5cefc2d39e477f59a490f0