Merge "Fix gNumProxies double increment."
am: 18f8500e32

Change-Id: I1cc29693fd50fc033342c592841a17dbd5b9d532