[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11

Change-Id: If1e4758c3c25dcc5f86ecabc850581f223dfb2ff