Merge "Fix 'potential memory leak' compiler warning." into nyc-dev
am: a810630df2

Change-Id: I8ff7ee6622f807c6feb988a122d6b5a8c3eefbfb