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

Change-Id: I9c9f6f5cce2ff475148d498896dc36f0b381c977