Merge "[automerger] Merge "Fix 'potential memory leak' compiler warning." into...

Merge "[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630d am: 00824c3d am: 10ef0c6b am: 30782947 am: af0f766e am: 62548c00 am: bfb16d13" into oc-dr1-dev-plus-aosp
am: fdad13c9

Change-Id: I690bf79c2a66e24c8e9c37f3211943093e4caa6a