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

Change-Id: I90e203f48905b9a5e38d2be4a36b2bcb46097ac4