Fix memory leak am: 2815be21f2 am: 95677dbdd2
am: 5ddcff473d

Change-Id: I75aaed0519619b51d8fa343babbf2186b3dad07d