[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11 am: 3078294720 am: af0f766ea4 am: 62548c00e8 am: adfbcd1cdf am: 2d57573eda
am: 8669e51e69

Change-Id: I58d816677d72fbca8a981096ba420840c9812124