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

Change-Id: Ia51169703363cfa7eb488193316b12606097a970