Merge "Fix memory leak" into qt-dev
am: b3c46686be

Change-Id: Ie892263df60ac656adc885caa9b68d0411faa8c0