Merge changes from topic "b135715570-test-memory-leaks" into qt-dev am: c5ab1e8f8a am: ccedca8d86
am: 433e0c42aa

Change-Id: I4a4c0c056921fe0f0297108f60662f167ec4c351