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

Change-Id: Ia2f5c6628952af53831071099fa13641d6bd2db7