Fix proxy memory leak. am: 32c8bdc9fd  -s ours
am: 672f3cbe30  -s ours

Change-Id: I775f62f18ac0521df6ebcacc5a5c95d3c1ec46c3