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

Change-Id: I39f5db2bf430051d80ef27fe312cf3f397774edd