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

Change-Id: If8bacae18eef1ea74f153575bb705da3b4f7d543