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

Merge "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-mr1-dev am: b56556ef" into oc-mr1-dev-plus-aosp
am: 18ffb38b

Change-Id: Id60b7fc0c1213ebf85c8ee5a5246a1952f6c9b02