Merge "[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11 am: 3078294720 am: af0f766ea4 am: 62548c00e8 am: bfb16d1394" into oc-dr1-dev-plus-aosp am: fdad13c92a
am: 844a4fc4b4

Change-Id: If603d2c30c4c58852c6733a670613cd82fd89141