Merge \\"Remove dead code that could have a memory leak\\" into nyc-mr1-dev am: d1e94a10eb
am: 19aa60b67a

Change-Id: I47bd9f8f15f89c96af4ac6c67a193abc331f2e60