Fix proxy memory leak. am: 25508806b8 am: fc12902fc7
am: c490b8b724

Change-Id: I232c3dfc74fe6f3fbd1c9c2c8becfbed80ec05e0