Merge "Fix a memory leak"
am: 3260678523

Change-Id: I16deb0ac3470d4bf590fc777d3064c676b261215