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

Change-Id: I493f6ce73fa41751212e2ee8ec06c7b0b73ac011