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

Change-Id: Id8b7a37a8dd15e59266dbe91b0d376b338465863