Merge "Fix a memory leak." am: 1715678a89 am: 8f9c005fa9
am: 85785b557a

Change-Id: I1e05b7d2793797cba915d0debd775b6b09b972cb