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

Change-Id: I17ac90591eccda755a908121c8b140ad3b87aeaf