Merge "Fix potental memory leak (compiler warning)."
am: c1184a7991

Change-Id: I78b5d0ed14bfb18108ee43a8d3570cdb6bc65b32